]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
networkAgent: use absolute path if configured
authorClemens Buchacher <drizzd@aon.at>
Sun, 1 Jul 2012 16:48:48 +0000 (18:48 +0200)
committerGiovanni Campagna <gcampagna@src.gnome.org>
Wed, 4 Jul 2012 17:39:26 +0000 (19:39 +0200)
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
https://bugzilla.gnome.org/show_bug.cgi?id=679212

js/ui/networkAgent.js

index cc44fa2abf7db29189122a43331120f4a89f4820..c9473a7668d51af06717baffe61c6efe1e2b7649 100644 (file)
@@ -683,7 +683,10 @@ const NetworkAgent = new Lang.Class({
                     try {
                         externalUIMode = keyfile.get_boolean('GNOME', 'supports-external-ui-mode');
                     } catch(e) { } // ignore errors if key does not exist
-                    let path = GLib.build_filenamev([Config.LIBEXECDIR, binary]);
+                    let path = binary;
+                    if (!GLib.path_is_absolute(path)) {
+                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
+                    }
 
                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))
                         this._vpnBinaries[service] = { fileName: path, externalUIMode: externalUIMode };